Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Fri, 23 Sep 2011 14:42:06 +0000 (07:42 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Fri, 23 Sep 2011 14:42:06 +0000 (07:42 -0700)
commit08da34321c8c1692e01c625c8e1f7b0e8e80013e
treea938bf85eaa6592ccaab54b774211ed509c88082
parent1f54f645c58b11ec4e7b83de19defa9208e22e92
parent9ba6dcd024442bfd6e4d2bc8504d97464f058def
Merge from trunk.